Don't blink the cursor if the entry is not editable. (#304171,Nikos

2005-05-16  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkentry.c (cursor_blinks): Don't blink the cursor if
	the entry is not editable.  (#304171,Nikos Kouremenos)

diff --git a/ChangeLog b/ChangeLog
index 30971cb87f20af6761a6523972ce350a53a33d1c..36ba87a51bd18b789906503affaced0d2578050b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-05-16  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkentry.c (cursor_blinks): Don't blink the cursor if 
+       the entry is not editable.  (#304171,Nikos Kouremenos)
+       
        * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor): 
        Make sure the action of the button and the dialog are in sync,
        when the dialog is provided by the app.  (#303987, David A Knight)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 30971cb87f20af6761a6523972ce350a53a33d1c..36ba87a51bd18b789906503affaced0d2578050b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-05-16  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkentry.c (cursor_blinks): Don't blink the cursor if 
+       the entry is not editable.  (#304171,Nikos Kouremenos)
+       
        * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor): 
        Make sure the action of the button and the dialog are in sync,
        when the dialog is provided by the app.  (#303987, David A Knight)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 30971cb87f20af6761a6523972ce350a53a33d1c..36ba87a51bd18b789906503affaced0d2578050b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2005-05-16  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkentry.c (cursor_blinks): Don't blink the cursor if 
+       the entry is not editable.  (#304171,Nikos Kouremenos)
+       
        * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor): 
        Make sure the action of the button and the dialog are in sync,
        when the dialog is provided by the app.  (#303987, David A Knight)

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index b7b69420f969ae40cb9a8e78922d4973bffbf1f6..88badc5e4fa224cb58d9e14ee725d7c10cdc902f 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -4788,6 +4788,7 @@ cursor_blinks (GtkEntry *entry)
   gboolean blink;
 
   if (GTK_WIDGET_HAS_FOCUS (entry) &&
+      entry->editable &&
       entry->selection_bound == entry->current_pos)
     {
       g_object_get (settings, "gtk-cursor-blink", &blink, NULL);